Merge "Remove VNDK definition(s)" into main am: ab7d809ff1 Original change: https://android-review.googlesource.com/c/platform/external/compiler-rt/+/2994437 Change-Id: I7369ac200f186aadd14bb12bf92ed491ac253bdc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>